From e7521805a5908992899ed4e28d4095c045093778 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Mon, 25 Jan 2021 22:00:03 -0600 Subject: [PATCH] Change component name from pgwui_testing to pgwui_develop --- .coveragerc | 2 +- .gitignore | 2 +- MANIFEST.in | 4 ++-- Makefile | 8 ++++---- README.rst | 15 ++++++++------- README.template | 4 ++-- pip_setup | 2 +- setup.py | 12 ++++++------ .../TEMPLATE/.coveragerc.mak | 0 .../TEMPLATE/.gitignore.mak | 0 .../TEMPLATE/LICENSE.txt | 0 .../TEMPLATE/MANIFEST.in.mak | 0 .../TEMPLATE/Makefile.mak | 0 .../TEMPLATE/Makefile_pgwui.mk | 0 .../TEMPLATE/README.rst.mak | 0 .../TEMPLATE/help.mk | 0 .../TEMPLATE/setup.cfg | 0 .../TEMPLATE/setup.py.mak | 2 +- .../TEMPLATE/src/pgwui_TEMPLATE/VERSION | 0 .../TEMPLATE/src/pgwui_TEMPLATE/__init__.py.mak | 0 .../src/pgwui_TEMPLATE/check_settings.py.mak | 0 .../TEMPLATE/src/pgwui_TEMPLATE/exceptions.py.mak | 0 .../src/pgwui_TEMPLATE/pgwui_TEMPLATE.py.mak | 0 .../pgwui_TEMPLATE/templates/TEMPLATE.mak.makish | 0 .../src/pgwui_TEMPLATE/views/TEMPLATE.py.mak | 0 .../src/pgwui_TEMPLATE/views/__init__.py.ish | 0 .../TEMPLATE/tests/test_check_settings.py.mak | 4 ++-- .../TEMPLATE/tests/test_pgwui_TEMPLATE.py.mak | 2 +- .../TEMPLATE/tests/views/test_TEMPLATE.py.mak | 0 .../TEMPLATE/tox.ini.mak | 2 +- src/{pgwui_testing => pgwui_develop}/VERSION | 0 src/{pgwui_testing => pgwui_develop}/__init__.py | 0 src/{pgwui_testing => pgwui_develop}/pgwui.py | 4 ++-- .../pytest_plugin.py | 6 +++--- .../pytest_plugin_helpers.py | 2 +- src/{pgwui_testing => pgwui_develop}/testing.py | 4 ++-- tests/test_pgwui.py | 8 ++++---- tests/test_pytest_plugin.py | 10 +++++----- tests/test_pytest_plugin_helpers.py | 6 +++--- tests/test_testing.py | 6 +++--- tox.ini | 6 +++--- 41 files changed, 56 insertions(+), 55 deletions(-) rename src/{pgwui_testing => pgwui_develop}/TEMPLATE/.coveragerc.mak (100%) rename src/{pgwui_testing => pgwui_develop}/TEMPLATE/.gitignore.mak (100%) rename src/{pgwui_testing => pgwui_develop}/TEMPLATE/LICENSE.txt (100%) rename src/{pgwui_testing => pgwui_develop}/TEMPLATE/MANIFEST.in.mak (100%) rename src/{pgwui_testing => pgwui_develop}/TEMPLATE/Makefile.mak (100%) rename src/{pgwui_testing => pgwui_develop}/TEMPLATE/Makefile_pgwui.mk (100%) rename src/{pgwui_testing => pgwui_develop}/TEMPLATE/README.rst.mak (100%) rename src/{pgwui_testing => pgwui_develop}/TEMPLATE/help.mk (100%) rename src/{pgwui_testing => pgwui_develop}/TEMPLATE/setup.cfg (100%) rename src/{pgwui_testing => pgwui_develop}/TEMPLATE/setup.py.mak (99%) rename src/{pgwui_testing => pgwui_develop}/TEMPLATE/src/pgwui_TEMPLATE/VERSION (100%) rename src/{pgwui_testing => pgwui_develop}/TEMPLATE/src/pgwui_TEMPLATE/__init__.py.mak (100%) rename src/{pgwui_testing => pgwui_develop}/TEMPLATE/src/pgwui_TEMPLATE/check_settings.py.mak (100%) rename src/{pgwui_testing => pgwui_develop}/TEMPLATE/src/pgwui_TEMPLATE/exceptions.py.mak (100%) rename src/{pgwui_testing => pgwui_develop}/TEMPLATE/src/pgwui_TEMPLATE/pgwui_TEMPLATE.py.mak (100%) rename src/{pgwui_testing => pgwui_develop}/TEMPLATE/src/pgwui_TEMPLATE/templates/TEMPLATE.mak.makish (100%) rename src/{pgwui_testing => pgwui_develop}/TEMPLATE/src/pgwui_TEMPLATE/views/TEMPLATE.py.mak (100%) rename src/{pgwui_testing => pgwui_develop}/TEMPLATE/src/pgwui_TEMPLATE/views/__init__.py.ish (100%) rename src/{pgwui_testing => pgwui_develop}/TEMPLATE/tests/test_check_settings.py.mak (96%) rename src/{pgwui_testing => pgwui_develop}/TEMPLATE/tests/test_pgwui_TEMPLATE.py.mak (98%) rename src/{pgwui_testing => pgwui_develop}/TEMPLATE/tests/views/test_TEMPLATE.py.mak (100%) rename src/{pgwui_testing => pgwui_develop}/TEMPLATE/tox.ini.mak (97%) rename src/{pgwui_testing => pgwui_develop}/VERSION (100%) rename src/{pgwui_testing => pgwui_develop}/__init__.py (100%) rename src/{pgwui_testing => pgwui_develop}/pgwui.py (98%) rename src/{pgwui_testing => pgwui_develop}/pytest_plugin.py (90%) rename src/{pgwui_testing => pgwui_develop}/pytest_plugin_helpers.py (96%) rename src/{pgwui_testing => pgwui_develop}/testing.py (96%) diff --git a/.coveragerc b/.coveragerc index 952ffd5..ef1e210 100644 --- a/.coveragerc +++ b/.coveragerc @@ -2,7 +2,7 @@ branch = True disable_warnings = module-not-measured source = - pgwui_testing + pgwui_develop [report] show_missing = True diff --git a/.gitignore b/.gitignore index bd5d3f5..cd9b97f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,4 @@ devel/ dist/ docs/build/ README.html -src/pgwui_testing.egg-info/ +src/pgwui_develop.egg-info/ diff --git a/MANIFEST.in b/MANIFEST.in index ea0c1c3..3d9f5e7 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -9,9 +9,9 @@ include make_dist include Makefile include pip_setup include README.template -include src/pgwui_testing/VERSION +include src/pgwui_develop/VERSION include tox.ini # Include the template for a new PGWUI component -recursive-include src/pgwui_testing/TEMPLATE * +recursive-include src/pgwui_develop/TEMPLATE * # Exclude emacs backup files global-exclude *~ diff --git a/Makefile b/Makefile index 30689ef..5d79515 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ -# Copyright (C) 2016, 2017, 2018, 2019, 2020 The Meme Factory, Inc. +# Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021 The Meme Factory, Inc. # http://www.karlpinc.com/ -# This file is part of PGWUI_Testing. +# This file is part of PGWUI_Develop. # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Affero General Public License @@ -20,13 +20,13 @@ # Karl O. Pinc -PGWUI_COMPONENT := pgwui_testing +PGWUI_COMPONENT := pgwui_develop include Makefile_pgwui.mk # For check -export COV_CORE_SOURCE := pgwui_testing +export COV_CORE_SOURCE := pgwui_develop export COV_CORE_CONFIG := .coveragerc export COV_CORE_DATAFILE := .coverage.eager diff --git a/README.rst b/README.rst index fa7b51c..90deb46 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,8 @@ -.. Copyright (C) 2018, 2020 The Meme Factory, Inc. http://www.karlpinc.com/ +.. Copyright (C) 2018, 2020, 2021 The Meme Factory, Inc. + http://www.karlpinc.com/ - This file is part of PGWUI_Testing. + This file is part of PGWUI_Develop. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License @@ -21,13 +22,13 @@ .. #End Of Copyright Marker# -PGWUI_Testing +PGWUI_Develop ============= Short Documentation ------------------- -PGWUI_Testing stands for `PostgreSQL`_ Web User Interface regression testing. +PGWUI_Develop stands for `PostgreSQL`_ Web User Interface development tools. Utilities to assist in the testing and development of the PGWUI suite of programs. @@ -76,14 +77,14 @@ Development Status Although in use in production systems the PGWUI suite must be considered Beta code. You may wish to install a specific version to -ensure consistent behavior as PGWUI_Testing is developed. +ensure consistent behavior as PGWUI_Develop is developed. Complete Documentation ---------------------- -The complete documentation set can be found on the PGWUI_Testing home -page at http://pgwui_testing.readthedocs.io/. +The complete documentation set can be found on the PGWUI_Develop home +page at http://pgwui_develop.readthedocs.io/. License diff --git a/README.template b/README.template index 0fcb39c..fbb29a2 100644 --- a/README.template +++ b/README.template @@ -1,7 +1,7 @@ - Copyright (C) 2020 The Meme Factory, Inc. http://www.karlpinc.com/ + Copyright (C) 2020, 2021 The Meme Factory, Inc. http://www.karlpinc.com/ - This file is part of PGWUI_Testing. + This file is part of PGWUI_Develop. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License diff --git a/pip_setup b/pip_setup index 27a4bc0..0973582 100644 --- a/pip_setup +++ b/pip_setup @@ -2,4 +2,4 @@ # All the places to find pgwui components so that venvs can be # instantiated. -export PIP_FIND_LINKS='../../pgwui_common/PGWUI_Common/dist/ ../../pgwui_core/PGWUI_Core/dist/ ../../pgwui_logout/PGWUI_Logout/dist ../../pgwui_menu/PGWUI_Menu/dist/ ../../pgwui_server/PGWUI_Server/dist/ ../../pgwui_upload/PGWUI_Upload/dist ../../pgwui_upload_core/PGWUI_Upload_Core/dist/ ../../pgwui_bulk_upload/PGWUI_Bulk_Upload/dist/ ../../pgwui_testing/PGWUI_Testing/dist' \ No newline at end of file +export PIP_FIND_LINKS='../../pgwui_common/PGWUI_Common/dist/ ../../pgwui_core/PGWUI_Core/dist/ ../../pgwui_logout/PGWUI_Logout/dist ../../pgwui_menu/PGWUI_Menu/dist/ ../../pgwui_server/PGWUI_Server/dist/ ../../pgwui_upload/PGWUI_Upload/dist ../../pgwui_upload_core/PGWUI_Upload_Core/dist/ ../../pgwui_bulk_upload/PGWUI_Bulk_Upload/dist/ ../../pgwui_develop/PGWUI_Develop/dist' \ No newline at end of file diff --git a/setup.py b/setup.py index 02a8091..3f483d9 100644 --- a/setup.py +++ b/setup.py @@ -50,7 +50,7 @@ def filter_readme(): here = path.abspath(path.dirname(__file__)) # Get program version -with open(path.join(here, 'src', 'pgwui_testing', 'VERSION'), +with open(path.join(here, 'src', 'pgwui_develop', 'VERSION'), encoding='utf-8') as version_file: version = version_file.read().strip() @@ -64,7 +64,7 @@ tests_require = [ ] setup( - name='pgwui_testing', + name='pgwui_develop', # Versioning is major.minor.fixes. Major releases change (after 1.0.0) # when backward incompatibility is introduced. Minor releases introduce @@ -77,7 +77,7 @@ setup( long_description_content_type='text/x-rst', # The project's main homepage. - url='http://pgwui_testing.readthedocs.io/', + url='http://pgwui_develop.readthedocs.io/', # Author details author='Karl O. Pinc', @@ -151,7 +151,7 @@ setup( # installed, specify them here. If using Python 2.6 or less, then these # have to be included in MANIFEST.in as well. package_data={ - 'pgwui_testing': [ + 'pgwui_develop': [ 'VERSION', 'TEMPLATE/*', 'TEMPLATE/.*', @@ -171,8 +171,8 @@ setup( # }, entry_points={ 'console_scripts': [ - 'pgwui = pgwui_testing.pgwui:pgwui', + 'pgwui = pgwui_develop.pgwui:pgwui', ], - 'pytest11': ['pgwui = pgwui_testing.pytest_plugin'], + 'pytest11': ['pgwui = pgwui_develop.pytest_plugin'], }, ) diff --git a/src/pgwui_testing/TEMPLATE/.coveragerc.mak b/src/pgwui_develop/TEMPLATE/.coveragerc.mak similarity index 100% rename from src/pgwui_testing/TEMPLATE/.coveragerc.mak rename to src/pgwui_develop/TEMPLATE/.coveragerc.mak diff --git a/src/pgwui_testing/TEMPLATE/.gitignore.mak b/src/pgwui_develop/TEMPLATE/.gitignore.mak similarity index 100% rename from src/pgwui_testing/TEMPLATE/.gitignore.mak rename to src/pgwui_develop/TEMPLATE/.gitignore.mak diff --git a/src/pgwui_testing/TEMPLATE/LICENSE.txt b/src/pgwui_develop/TEMPLATE/LICENSE.txt similarity index 100% rename from src/pgwui_testing/TEMPLATE/LICENSE.txt rename to src/pgwui_develop/TEMPLATE/LICENSE.txt diff --git a/src/pgwui_testing/TEMPLATE/MANIFEST.in.mak b/src/pgwui_develop/TEMPLATE/MANIFEST.in.mak similarity index 100% rename from src/pgwui_testing/TEMPLATE/MANIFEST.in.mak rename to src/pgwui_develop/TEMPLATE/MANIFEST.in.mak diff --git a/src/pgwui_testing/TEMPLATE/Makefile.mak b/src/pgwui_develop/TEMPLATE/Makefile.mak similarity index 100% rename from src/pgwui_testing/TEMPLATE/Makefile.mak rename to src/pgwui_develop/TEMPLATE/Makefile.mak diff --git a/src/pgwui_testing/TEMPLATE/Makefile_pgwui.mk b/src/pgwui_develop/TEMPLATE/Makefile_pgwui.mk similarity index 100% rename from src/pgwui_testing/TEMPLATE/Makefile_pgwui.mk rename to src/pgwui_develop/TEMPLATE/Makefile_pgwui.mk diff --git a/src/pgwui_testing/TEMPLATE/README.rst.mak b/src/pgwui_develop/TEMPLATE/README.rst.mak similarity index 100% rename from src/pgwui_testing/TEMPLATE/README.rst.mak rename to src/pgwui_develop/TEMPLATE/README.rst.mak diff --git a/src/pgwui_testing/TEMPLATE/help.mk b/src/pgwui_develop/TEMPLATE/help.mk similarity index 100% rename from src/pgwui_testing/TEMPLATE/help.mk rename to src/pgwui_develop/TEMPLATE/help.mk diff --git a/src/pgwui_testing/TEMPLATE/setup.cfg b/src/pgwui_develop/TEMPLATE/setup.cfg similarity index 100% rename from src/pgwui_testing/TEMPLATE/setup.cfg rename to src/pgwui_develop/TEMPLATE/setup.cfg diff --git a/src/pgwui_testing/TEMPLATE/setup.py.mak b/src/pgwui_develop/TEMPLATE/setup.py.mak similarity index 99% rename from src/pgwui_testing/TEMPLATE/setup.py.mak rename to src/pgwui_develop/TEMPLATE/setup.py.mak index 2d9bfa3..03f03a2 100644 --- a/src/pgwui_testing/TEMPLATE/setup.py.mak +++ b/src/pgwui_develop/TEMPLATE/setup.py.mak @@ -59,7 +59,7 @@ long_description = filter_readme() # Pyramid testing requirements tests_require = [ - 'pgwui_testing==' + version, + 'pgwui_develop==' + version, 'WebTest >= 1.3.1', # py3 compat 'pytest>=3.7.4', 'pytest-cov', diff --git a/src/pgwui_testing/TEMPLATE/src/pgwui_TEMPLATE/VERSION b/src/pgwui_develop/TEMPLATE/src/pgwui_TEMPLATE/VERSION similarity index 100% rename from src/pgwui_testing/TEMPLATE/src/pgwui_TEMPLATE/VERSION rename to src/pgwui_develop/TEMPLATE/src/pgwui_TEMPLATE/VERSION diff --git a/src/pgwui_testing/TEMPLATE/src/pgwui_TEMPLATE/__init__.py.mak b/src/pgwui_develop/TEMPLATE/src/pgwui_TEMPLATE/__init__.py.mak similarity index 100% rename from src/pgwui_testing/TEMPLATE/src/pgwui_TEMPLATE/__init__.py.mak rename to src/pgwui_develop/TEMPLATE/src/pgwui_TEMPLATE/__init__.py.mak diff --git a/src/pgwui_testing/TEMPLATE/src/pgwui_TEMPLATE/check_settings.py.mak b/src/pgwui_develop/TEMPLATE/src/pgwui_TEMPLATE/check_settings.py.mak similarity index 100% rename from src/pgwui_testing/TEMPLATE/src/pgwui_TEMPLATE/check_settings.py.mak rename to src/pgwui_develop/TEMPLATE/src/pgwui_TEMPLATE/check_settings.py.mak diff --git a/src/pgwui_testing/TEMPLATE/src/pgwui_TEMPLATE/exceptions.py.mak b/src/pgwui_develop/TEMPLATE/src/pgwui_TEMPLATE/exceptions.py.mak similarity index 100% rename from src/pgwui_testing/TEMPLATE/src/pgwui_TEMPLATE/exceptions.py.mak rename to src/pgwui_develop/TEMPLATE/src/pgwui_TEMPLATE/exceptions.py.mak diff --git a/src/pgwui_testing/TEMPLATE/src/pgwui_TEMPLATE/pgwui_TEMPLATE.py.mak b/src/pgwui_develop/TEMPLATE/src/pgwui_TEMPLATE/pgwui_TEMPLATE.py.mak similarity index 100% rename from src/pgwui_testing/TEMPLATE/src/pgwui_TEMPLATE/pgwui_TEMPLATE.py.mak rename to src/pgwui_develop/TEMPLATE/src/pgwui_TEMPLATE/pgwui_TEMPLATE.py.mak diff --git a/src/pgwui_testing/TEMPLATE/src/pgwui_TEMPLATE/templates/TEMPLATE.mak.makish b/src/pgwui_develop/TEMPLATE/src/pgwui_TEMPLATE/templates/TEMPLATE.mak.makish similarity index 100% rename from src/pgwui_testing/TEMPLATE/src/pgwui_TEMPLATE/templates/TEMPLATE.mak.makish rename to src/pgwui_develop/TEMPLATE/src/pgwui_TEMPLATE/templates/TEMPLATE.mak.makish diff --git a/src/pgwui_testing/TEMPLATE/src/pgwui_TEMPLATE/views/TEMPLATE.py.mak b/src/pgwui_develop/TEMPLATE/src/pgwui_TEMPLATE/views/TEMPLATE.py.mak similarity index 100% rename from src/pgwui_testing/TEMPLATE/src/pgwui_TEMPLATE/views/TEMPLATE.py.mak rename to src/pgwui_develop/TEMPLATE/src/pgwui_TEMPLATE/views/TEMPLATE.py.mak diff --git a/src/pgwui_testing/TEMPLATE/src/pgwui_TEMPLATE/views/__init__.py.ish b/src/pgwui_develop/TEMPLATE/src/pgwui_TEMPLATE/views/__init__.py.ish similarity index 100% rename from src/pgwui_testing/TEMPLATE/src/pgwui_TEMPLATE/views/__init__.py.ish rename to src/pgwui_develop/TEMPLATE/src/pgwui_TEMPLATE/views/__init__.py.ish diff --git a/src/pgwui_testing/TEMPLATE/tests/test_check_settings.py.mak b/src/pgwui_develop/TEMPLATE/tests/test_check_settings.py.mak similarity index 96% rename from src/pgwui_testing/TEMPLATE/tests/test_check_settings.py.mak rename to src/pgwui_develop/TEMPLATE/tests/test_check_settings.py.mak index a35aabf..a3ec823 100644 --- a/src/pgwui_testing/TEMPLATE/tests/test_check_settings.py.mak +++ b/src/pgwui_develop/TEMPLATE/tests/test_check_settings.py.mak @@ -1,4 +1,4 @@ -# Copyright (C) 2020 The Meme Factory, Inc. http://www.karlpinc.com/ +# Copyright (C) 2020, 2021 The Meme Factory, Inc. http://www.karlpinc.com/ # This file is part of ${component}. # @@ -24,7 +24,7 @@ import pytest import ${component.lower()}.check_settings as check_settings from pgwui_common import checkset -from pgwui_testing import testing +from pgwui_develop import testing from ${component.lower()} import exceptions as ex # Activiate the PGWUI pytest plugin diff --git a/src/pgwui_testing/TEMPLATE/tests/test_pgwui_TEMPLATE.py.mak b/src/pgwui_develop/TEMPLATE/tests/test_pgwui_TEMPLATE.py.mak similarity index 98% rename from src/pgwui_testing/TEMPLATE/tests/test_pgwui_TEMPLATE.py.mak rename to src/pgwui_develop/TEMPLATE/tests/test_pgwui_TEMPLATE.py.mak index e9826d1..f18a2f4 100644 --- a/src/pgwui_testing/TEMPLATE/tests/test_pgwui_TEMPLATE.py.mak +++ b/src/pgwui_develop/TEMPLATE/tests/test_pgwui_TEMPLATE.py.mak @@ -24,7 +24,7 @@ import pyramid.testing import ${component.lower()}.${component.lower()} as ${component.lower()} -from pgwui_testing import testing +from pgwui_develop import testing # Activiate the PGWUI pytest plugin pytest_plugins = ("pgwui",) diff --git a/src/pgwui_testing/TEMPLATE/tests/views/test_TEMPLATE.py.mak b/src/pgwui_develop/TEMPLATE/tests/views/test_TEMPLATE.py.mak similarity index 100% rename from src/pgwui_testing/TEMPLATE/tests/views/test_TEMPLATE.py.mak rename to src/pgwui_develop/TEMPLATE/tests/views/test_TEMPLATE.py.mak diff --git a/src/pgwui_testing/TEMPLATE/tox.ini.mak b/src/pgwui_develop/TEMPLATE/tox.ini.mak similarity index 97% rename from src/pgwui_testing/TEMPLATE/tox.ini.mak rename to src/pgwui_develop/TEMPLATE/tox.ini.mak index b91d317..1c61400 100644 --- a/src/pgwui_testing/TEMPLATE/tox.ini.mak +++ b/src/pgwui_develop/TEMPLATE/tox.ini.mak @@ -11,7 +11,7 @@ deps = check-manifest cmarkgfm flake8 - pgwui_testing + pgwui_develop pytest pytest-cov twine diff --git a/src/pgwui_testing/VERSION b/src/pgwui_develop/VERSION similarity index 100% rename from src/pgwui_testing/VERSION rename to src/pgwui_develop/VERSION diff --git a/src/pgwui_testing/__init__.py b/src/pgwui_develop/__init__.py similarity index 100% rename from src/pgwui_testing/__init__.py rename to src/pgwui_develop/__init__.py diff --git a/src/pgwui_testing/pgwui.py b/src/pgwui_develop/pgwui.py similarity index 98% rename from src/pgwui_testing/pgwui.py rename to src/pgwui_develop/pgwui.py index e022d17..0ea86b5 100644 --- a/src/pgwui_testing/pgwui.py +++ b/src/pgwui_develop/pgwui.py @@ -1,6 +1,6 @@ -# Copyright (C) 2020 The Meme Factory, Inc. http://www.karlpinc.com/ +# Copyright (C) 2020, 2021 The Meme Factory, Inc. http://www.karlpinc.com/ -# This file is part of PGWUI_Testing. +# This file is part of PGWUI_Develop. # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Affero General Public License diff --git a/src/pgwui_testing/pytest_plugin.py b/src/pgwui_develop/pytest_plugin.py similarity index 90% rename from src/pgwui_testing/pytest_plugin.py rename to src/pgwui_develop/pytest_plugin.py index 025e55d..96fbdb6 100644 --- a/src/pgwui_testing/pytest_plugin.py +++ b/src/pgwui_develop/pytest_plugin.py @@ -1,7 +1,7 @@ -# Copyright (C) 2015, 2018, 2020 The Meme Factory, Inc. +# Copyright (C) 2015, 2018, 2020, 2021 The Meme Factory, Inc. # http://www.karlpinc.com/ -# This file is part of PGWUI_Testing. +# This file is part of PGWUI_Develop. # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Affero General Public License @@ -29,7 +29,7 @@ from pyramid.testing import ( tearDown ) -from pgwui_testing import pytest_plugin_helpers +from pgwui_develop import pytest_plugin_helpers # Fixtures diff --git a/src/pgwui_testing/pytest_plugin_helpers.py b/src/pgwui_develop/pytest_plugin_helpers.py similarity index 96% rename from src/pgwui_testing/pytest_plugin_helpers.py rename to src/pgwui_develop/pytest_plugin_helpers.py index da1cbf2..21a4293 100644 --- a/src/pgwui_testing/pytest_plugin_helpers.py +++ b/src/pgwui_develop/pytest_plugin_helpers.py @@ -1,7 +1,7 @@ # Copyright (C) 2015, 2018, 2020 The Meme Factory, Inc. # http://www.karlpinc.com/ -# This file is part of PGWUI_Testing. +# This file is part of PGWUI_Develop. # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Affero General Public License diff --git a/src/pgwui_testing/testing.py b/src/pgwui_develop/testing.py similarity index 96% rename from src/pgwui_testing/testing.py rename to src/pgwui_develop/testing.py index 402626f..a704536 100644 --- a/src/pgwui_testing/testing.py +++ b/src/pgwui_develop/testing.py @@ -1,7 +1,7 @@ -# Copyright (C) 2015, 2018, 2020 The Meme Factory, Inc. +# Copyright (C) 2015, 2018, 2020, 2021 The Meme Factory, Inc. # http://www.karlpinc.com/ -# This file is part of PGWUI_Testing. +# This file is part of PGWUI_Develop. # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Affero General Public License diff --git a/tests/test_pgwui.py b/tests/test_pgwui.py index 5fa53ae..1807efe 100644 --- a/tests/test_pgwui.py +++ b/tests/test_pgwui.py @@ -1,6 +1,6 @@ -# Copyright (C) 2020 The Meme Factory, Inc. http://www.karlpinc.com/ +# Copyright (C) 2020, 2021 The Meme Factory, Inc. http://www.karlpinc.com/ -# This file is part of PGWUI_Testing. +# This file is part of PGWUI_Develop. # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Affero General Public License @@ -25,8 +25,8 @@ import pathlib from unittest import mock -from pgwui_testing import testing -import pgwui_testing.pgwui as pgwui +from pgwui_develop import testing +import pgwui_develop.pgwui as pgwui # Mock fixtures for module level objects MockTemplate = testing.make_magicmock_fixture( diff --git a/tests/test_pytest_plugin.py b/tests/test_pytest_plugin.py index 7557e6f..949cceb 100644 --- a/tests/test_pytest_plugin.py +++ b/tests/test_pytest_plugin.py @@ -1,7 +1,7 @@ -# Copyright (C) 2018, 2019, 2020 The Meme Factory, Inc. +# Copyright (C) 2018, 2019, 2020, 2021 The Meme Factory, Inc. # http://www.karlpinc.com/ -# This file is part of PGWUI_Testing. +# This file is part of PGWUI_Develop. # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Affero General Public License @@ -35,12 +35,12 @@ pytest_plugins = ("pytester",) # pgwui_check_settings_entry_point() @pytest.mark.unittest -def test_pgwui_testing_fixtures(testdir): +def test_pgwui_develop_fixtures(testdir): '''Test the fixtures supplied by the pytest_plugin module ''' testdir.makepyfile( ''' - from pgwui_testing import pytest_plugin_helpers + from pgwui_develop import pytest_plugin_helpers import pytest from unittest import mock @@ -54,7 +54,7 @@ def test_pgwui_testing_fixtures(testdir): # Activiate our pytest plugin - pytest_plugins = ("pgwui_testing",) + pytest_plugins = ("pgwui_develop",) # pyramid_config diff --git a/tests/test_pytest_plugin_helpers.py b/tests/test_pytest_plugin_helpers.py index 919e738..a7dabfc 100644 --- a/tests/test_pytest_plugin_helpers.py +++ b/tests/test_pytest_plugin_helpers.py @@ -1,7 +1,7 @@ -# Copyright (C) 2020 The Meme Factory, Inc. +# Copyright (C) 2020, 2021 The Meme Factory, Inc. # http://www.karlpinc.com/ -# This file is part of PGWUI_Testing. +# This file is part of PGWUI_Develop. # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Affero General Public License @@ -24,7 +24,7 @@ import pytest -from pgwui_testing import pytest_plugin_helpers +from pgwui_develop import pytest_plugin_helpers # pgwui_entry_point() diff --git a/tests/test_testing.py b/tests/test_testing.py index 16e17d6..8e3f7df 100644 --- a/tests/test_testing.py +++ b/tests/test_testing.py @@ -1,7 +1,7 @@ -# Copyright (C) 2018, 2019, 2020 The Meme Factory, Inc. +# Copyright (C) 2018, 2019, 2020, 2021 The Meme Factory, Inc. # http://www.karlpinc.com/ -# This file is part of PGWUI_Testing. +# This file is part of PGWUI_Develop. # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU Affero General Public License @@ -27,7 +27,7 @@ import pytest import sys -from pgwui_testing import testing +from pgwui_develop import testing # Test functions diff --git a/tox.ini b/tox.ini index d06fe1e..bbb4560 100644 --- a/tox.ini +++ b/tox.ini @@ -19,7 +19,7 @@ deps = # Tell coverage to turn on and append results so that when we # test we don't lose coverage due to warnings of previously having # imported a module. Necessary for testing fixtures. -# (Also, in commands=, we don't: --cov=pgwui_testing) +# (Also, in commands=, we don't: --cov=pgwui_develop) # (And, we have the [tool:pytest] section.) # See: https://pytest-cov.readthedocs.io/en/latest/plugins.html setenv = @@ -33,8 +33,8 @@ commands = twine check dist/* flake8 . coverage erase - py.test -m unittest --cov=pgwui_testing tests/ - py.test -m 'not unittest' --cov=pgwui_testing tests/ + py.test -m unittest --cov=pgwui_develop tests/ + py.test -m 'not unittest' --cov=pgwui_develop tests/ # coverage run --source src/testing -m py.test # coverage report -- 2.34.1